Merge from mainline.
authorPaul Eggert <eggert@cs.ucla.edu>
Mon, 17 Jan 2011 19:24:36 +0000 (11:24 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Mon, 17 Jan 2011 19:24:36 +0000 (11:24 -0800)
commita24f4ee4f0d8976ed60c6f43b2a61e1c4abc5981
treed26e2c3b0dd9b52fa1a27e0333b33411a94d370b
parent0418fb3520a72e2e759d18263b6ad21bf3996edb
parent43c8d47880f4103a5c8f8b2439cae0efa3338228
Merge from mainline.
src/ChangeLog
src/fileio.c
src/lisp.h
src/regex.c
src/xfns.c